Make sure data is being saved properly