Move edit (16/17)

Move edit