added bkgrnd
fix conflict