work in progress for persistence