TODO Updated, Java command edited