Upped vast-vmap
Second pass