reorganized some cutouts