applied last changes from java