rework application startup