2 functions updated acc to new java files