Updated and refined EvoGraph