Updates based on feedback from ajryan