Moved stuff around for upgrade