updated to include context-menu option