updated to use new wrapper and header