Moved things around.
Moved a few things around.
Optimisation