Changed to edting event handling to meet initial review comments