Adding more boolean conditions