Do we still need this since things always get saved?