improvements for phase3.1