Replace delegate call with on