changed todo and fix