simplified and update TODOs