slight change to data structure