starting to merge gss with latest updates
make work again