ENH: changed according to comments