Changed it to a Delegate scheme