Added boolean short circuiting for OR