some prep reorganization