small improvement moveAround
merge