Update argument name to final production name
Take exact grade prog into consideration with matrix selection