prepping for merge with jg-2 branch