Improve davide_trainer