Made some changes and added CP1