added renaming the variables
resolved conflicts with NOT