Update

Changed trigger and untrigger conditions