Trying something different with the background
Fixing the conflicts