This version works without hsolve. Now try to integrate hsolve.
Merged svn.