Making it easier to startup and run on first time check out