merge of james new changes from toms fork into mikes Origin