updates to Athletics
Merge branch 'chowk-athletics-fixes'