True, I did't liked that either. Having 2 separate script's might be the better solution. Will create a second PR tomorrow with 2 separate scripts and then @fideloper can choose.