Improve start-up procedure