removed the if's