Changing the place to do unpersist