modify for add toggle indicator