Added in move handling