AVALANCHE: More rework on Graphic code