Before removing date
Improved running in background
Save point
Big changes, commit for testing, will not work