Fifth batch: some java changed