Updates based on June/July 2014 feedback