More work on improving events