Updated to reflect Bill French updates.