Reinstitutes swap method, yet to be determined if this will be maintained