Javadoc removed, needs to be rewritten