cleanup; tested new idea to subscribe to event