For issue #4 - hopefully this will relax things a bit