More data, minor fix