Major update, much faster init times