some modifications to the data structures