Some more work on Edit Variable view