Better implementation of the exclusions