Modified Events to publish on condition fix #21