Added saving functionality
Added saving functionality 2