Modified transform script/fixed merge conflict