included self.wrap statements in R3