Third batch: some java changed