Improve with Yuen Method