Improve starting stage