Revert "Revert "Update Delegate.""

This reverts commit 866abe381a66aab4ce203743e6dd1aa7afe7d250.