Replaced form moving.
Added more