Improve startup time on pc