Corrected AND/OR convention reqs2