Updated fish class