working on moving functionalities