Update so move actions take ownership into account