pulled the shim out to a separate package
added the debug only flag