Converting to new SWPR