refine, and prepare for the new version