Move and upgrade and fix