Update the prototype with the new header.
Simplify some selectors