event handler in progress
more changes to handler