Added jdocs (needs improvement)