Mike/Tom Merge

Merge between Mike's and Tom's edits