Reworked for intermediate conversion.