Coach A (the cabbed push-pull one) has returned to the layout to take the place of Coach B. Having an intermediate waggon between it and the propelling locomotive appears to be causing some problems so D16 is currently the meat in a rolling stock sandwich. Some photos from the layout showing all of the locomotives: