Added a bunch of features on the train home