updated some functions to remove self.Used