updated save and load functionalities