These changes are probably bad.