Merge in Dan Keller's changes