Change calls to hooks