Updated fish functions