Delegation & improvement

Delegation & improvement