Updated + Javadoc added