Ernesto's changes for train running