Quick Athletics Fix
Merge branch 'Oct-17-1136'