Updated shim from Julian