 		 */		
 		public static function eraseDrawings(e:ContextMenuEvent):void
 		{
-			Weave.root.removeObject(PEN_OBJECT_NAME);
+			var linkableContainer:ILinkableContainer = getLinkableContainer(e.mouseTarget);
+			
+			if ( linkableContainer )
+				linkableContainer.getLinkableChildren().removeObject( PEN_OBJECT_NAME );
 			_penToolMenuItem.caption = ENABLE_PEN;
 			_removeDrawingsMenuItem.enabled = false;
 		}

		 */				
		public static function drawFunction(e:ContextMenuEvent):void
		{
			var penTool:PenMouse = Weave.root.requestObject(PEN_OBJECT_NAME, PenMouse, false ) as PenMouse;
			if( _penToolMenuItem.caption == ENABLE_PEN )
			{
				// enable pen

				penTool.editMode = true;
				_penToolMenuItem.caption = DISABLE_PEN;
				_removeDrawingsMenuItem.enabled = true;
				CustomCursorManager.showCursor(CustomCursorManager.PEN_CURSOR, CursorManagerPriority.HIGH, -3, -22);
			}
			else
			{
