minor changes to the data structure