adapted Controller to new event system