modifications controllers
Merge branch 'dev-com'