Updated moving code