Updated Data Persistence in response to TA comments

For the 5th time...