More data and minor changes