Update to use transform step