minor changes on self.hs