upd move to do to issues