TRAINING:36: Finished version changes