just putting things back together before moving up to the next major version