Updated delegate method and usage
Cleanup