Removed some redundant saving (double saving)