some changes to support moves