Switch to new zero reference