Initial second round changes from Mihai.