started to fix the controllers