Agreed, the circuit would still be non-compliant - but by following what has been outlined here in the previous posts, i have made the circuit as safe as i can. I will note on my EIC that non-compliances are present for the lighting circuit in question and what i have done to make it as safe as possible to the customer - without connection of a CPC.