remove "self.class" I think