no more if statements, and proper redirect