ARCHI working with full z_maps now