todo from review