modify for a cleaner graph