Adding fish logic