Changed Delegate to be bower compatible, out of the gate