Fish, FishController changes