Adjusting to use header selection