added support for conditional && and ||