Modify and adapted to new LIUtils
Merge
www?