Change return type,  some more Javadocs