Integrating last night's changes