Updating some fish functions