Modified the Controller hierarchy to avoid duplication of methods
Fixing the merge conflict with Canvas, should be good