Add or/and operators
Removed debug lines