updated CCP location + added required validation