Replaced stray "or"s with ||