ENH: working on Denis' comments