Minor changes requested by hatstand.