2nd round of changes

2nd round of changes