Combined Tiffany's code in PersistentData