Project 2.39 to 1_clean