Apply changes based on Christina's review