zap is working - cc @idsera