More book stuff.
Accomodate nan changes.