added log and TODO