Faster launch as requested by Mark