upd: logic improvements