updated for removing persistance