added graphic_objects
merged changes