Added more data, added more triggers.