removed if statements