Ready, without reviewed javadoc (and javadoc is not on the functions)