sweeping undocumented changes... :s