final round of changes from Eli at Procopio