Dev

Updated by Xin Peng Zhang for a new java file.