Refactored some of the delegates