Copied in Ruffin's Changes.  Got rid o redundancy