Move calls to Save from view