Updating to match Fishbowl changes.