removed todo comments, as always solved