Enhancements sugested by andyt (NO J#)