minor revisions incl added partial fn [ci skip]