Updated v2 (missing runs and fixers)