some changes as suggested by John Remijn Paul Siegmann