switch to using header classes