more changes related to move functionality