More data, minor adjustment to initial function.