Updated some saving code