Work on header selection continues