bulked out revised persistence system