additional modifications for NumberZap