Removed vibes + fixed overcount