Changed conditional statements