further improvments of the make move func.