switched back to and logic (duh)