More work on Model Save Done