more progress on cp mode