Mike's changes from 6/9/14.