Address Improvements per Greg Moser