Addded short-circuit 'and' and 'or'