added And and Or short circuit