Athletics fix
Merge branch 'athletics'