Add BG, and some small modify