Tweak the shell function a bit