Added Future to save and removed unnecessary completers

please review changes, done changes through web editor