Upgradings

Pull from zeco's repo