Save functionality changes done