Removed todo since the todo was thought for other project - getting loco on my old days ;-)