Allow full graph to build - merge to master