lifecycle improvements