Separate v1 and v2, implement detailed grades