Edited

Moved a few things around.