tweak to single persistent object creation