redoing wrap structure