tweaks based on JASG session