further modifications on cofo
Merge branch 'dev'