Add fish functionality implemented