more massive reorganization to pass validation