Add a bit more to the metro demo