[sd2_mr0580] pick some differences from SD2 mainstreem