changed data structure for value