Fixed up metro example