commit for merge
java working, cc map not, dif output same, not sure issue