2nd round of changes