Update with final batch of changes