fixup performance and start adding back components

Created by  Bowei Liu  on December 24, 2020
CZPLX4O4R7K3TF3NSAL5PT7NO3CUOLDY3OR332GBIYYNKMZTW24AC
Change contents