Changes as per change request