#2 - adding some javadoc