WienerTrainer consolidation #104