#9 Graph controller expansion