Some sofatutor changes