I will do some review on the private zaps code then. This is so old that we might have broken it...