Update for millermedeiros review 2