Fix AND
Add NOT