Improve running on startup