More polishing. Events proved to be working.