changed move code