Fourth batch: some java changed