changed mug to fish
merged fixed