replaced underscore with self.