analysis-data instead of annos
adapt to analysis data