Moved the new fancy stuff around