more wrap simplification
further simplification of wrap