More work on hammer events performance