- TrackIter first = train.get_tail_block().track_iter();
- TrackIter next = train.get_head_block().next().track_iter();
+ const BlockAllocator &allocator = train.get_block_allocator();
+ TrackIter first = allocator.first().track_iter();
+ TrackIter next = fncb.track_iter();