Improve the forth part