Yes. I've also changed script to "more logical"