I do not think this is working with the 'new' handwrap code .... could someone else check?