Made OR and AND work like TA's