Add second version that handles data slightly differently.