moved condition comparations to QB