added events for production env