Some downgrader changes

Basic changes to downgrader