EUCE addition and Athletics Fix
Merge branch 'Oct-2-0857'