added && and || expressions