Revise life-cycle more correctly