Adding functionality to enable all needed stuff for running timesave scripts
Merge branch 'timesave_fix'