Use the scripted version.

New and old architecture