Large update for trainON and Expertzone compability