Update background, torches individual objs
Fixing merge conflict