Adding changes made by Hal and Brian.