Still working on it... not a trivial change.

Friedrich