ENH: address discussion