Working on new wrapper function