many changes to khmer and trinity