It's official: Martin back in No. 6 for '06