Further Gate/Wire splitting