Merging to bring things really back up to speed