updated to include new context menu feature