added brackets to line 141 to make sure the || operator is working as I want it to