Fix lifecycle, don’t scrap it