added and/or and changed === to ==