Java class version (22/24)

Java class version