Moved everything so it made sense