complete refactoring, parameters matching AIR [1.26] FALL [1.29]