Code updates from RCP training
updates from training