Moved things around to make more sense