upd: put some checks in