Changed order of logic... shouldn't micro optimize so much.