Fixing code, added java data