Implement Roy's recommendations for Graph Production