more changes requested by fish