1. todo was removed