Event Conroller changes