Revert background adding system until more stable