updated datastructures