Changes as per Charles