Because of some transform issues had to add some specific node code. Need to refactor this.
Merge