Changes based on feedback from atomicleopard