WIP
expanded headers to 30 points