removed dependency on the old wrapper