modify the class to improver the performance