YJ- updated TODO's