Integrating changes from Thursday