major changes

Updating with latest hui