changed my control statements