Changed train parser a bit.