changes after review by charles