Issue #72: Switch to new code