Linxj

Merge linxj and Allen