[D40][Refact] (BJ, CP) Back refacted