Adding and/or, changing this to self.