change to synchronized datastructures