update to merge of parastates branch