added a lot more data and modules