notes
merge master changes
CSM phase