Only has to run once now

Rearranged the order so that it only has to run once.