no more global variables for shapes :-D