got rid of self.old_s