@drewfish I can change the code to use `ModelVanilla`, but remember we didn't create this code, we copied as a temporary solution, and any update in the original code should be pulled in here as well, so the less changes, the better.