Updates.
Major simplifications to unify.