checking
Persistence fixes