add vmap . + some formatting