Final round of changes