Oh, before I forget, I may as well mention that I'm adding a few more changes to my CS.