Fixed up shuttle demo