Changed Move and removed unneeded code