oldValue not used some missing things?