[9#] changes in save method