Applied latest changes.