renaming and added move functionality