added more data, updated design