revert to simple move system