This version works with Transform - tested