No more shim-ing