Third round of changes - completed