I've just received mine fitted with a Loksound micro 5 decoder with stay-alive and a sugar cube speaker, all in the tender, from Olivia's trains. This means that the water barrel sits about 5mm higher in the tender and the coke load is tilted rather than flat, but to me that's an acceptable compromise as it sounds fine to me and runs smoothly.