ENH a bit better, but not quite right