Update for fish2