Reverted some modifications
Some updates concerning background handling