Pull Crystal's Updates to My Branch

Pull Crystal's Updates to My Branch