with less TODOs