Updated MediaShuttle