Implemented saving properly