partial adoption of Mathias suggestions