Changed some java stuff