changed a little. delete self.