Yep, thanks for pushing me to do this. I've just finished changing the code. It's removed 550 lines of code.