fixed todo again