finish up the if's