Bsongis/new trainer modes