Speed things up

Premature optimization is the root of all evil.  However, it's not
premature when it takes the startup time from hours to 45 seconds.
updated time