Toggle behavior updated