Upd on final draft