Simplified the flow of events between controls.