NEED WORK: Figure out what else needs to change since some default behavior has changed from 1.6 to 2.0
KNOWN: