tuning it up according to ToDo