updated data structures