AVALANCHE: move some more functions to Graphics