Added better moving checks