upd 10.07

take to account TODO
Will wait for Valerii