Defiant/Competitive fix + futureproof