added TODO coments
add comments