Replace gen-20 with a version that uses the model routines.