more data structure
change models