Added delegates.
Trying to fix merge conficts.