Added in changes from research branch