ok, replaced those, in scaladoc also