updared and reorganized shapes demo