some re-org + added standings data