Updated with wrapper.