removed tolist in this class as well