now need to fix controllers