Changes to conversion process. Reduced complexity.