Changed stuff regarding delegation.