Re: updates and testing instead of lifecycle