add two additional event handlers