Was using control flow in place of boolean operators, changed