Updated 12/1/14

Updated for logical operators