added TODO and Thanks