Corrected two event handling codes following the new FWK's technique