added && and ||