added fish functionality