changes from farm
trying to sort this mess out
Merge https://github.com/XLEvolutionist/cn.mops
removed error