added a 2nd round of changes