1) Yes, i did use other parts of the code with your changes

2) I did change the version to what you said.

But that doesn't matter now, i like other code better, it's more clean and simpler