Moved things around to decrease confusion.