broke fish update into smaller functions