made background dynamic
merge conflict