Refactored, trains exists
merging