[noticket] More logic