TODO's update