New installer, less complex