still messing with background
fix test
Merge branch 'master' into new_project