Massupdate

* Forked changes from Evervolv