rework proto-persistent
more proto-persistent