Work in progress - graph enhancement