Improve davide trainer