Suggested changes from previous commit.  f546579de75fb327ff024cfc632cf80fd6164bae