Modified the Delegate class file