revised to fix commenting errors with shimming