Split controller
fixat problemet
Merge branch 'controller'