- change to proper life cycle