@wandel

I've realised that there are still a few errors in the files I've attached.
Let me know if it works or not!
For the moment I haven't modified the archive from the previous post.