made some change, added javadoc