Incremental modifications to convert SWR1 to SWR2