Update Romanyuk/TODO