do not use translator now and fixed some issues.