Better competition handling