Improvements from request from Whitney on 8.5.2014