Got rid of value.value