Updated usage (menu based)