Changes suggested by robwierzbowski