incorporating Gwen's changes