Fixes athlete refactor