Update dict.n
merge with chokkans changes, resolve conflicts