Some of psav's suggestions