Altered code to use delegator functionality