trying to incorporate Jack's suggestion for #163