modification controller + routes
Merge branch 'dev-com'