removed unnessry method and excess self.s