added TODO and comment