Upgrade to proper location