Trainer improvements