2nd round of updates