Improved todo
fix