Move to a better location