if statements have been fixed