Added in Sam's changes for Release 2