Moved everything up