improvements from Pro1 -Yue