I made an edit, rather than a remake. It's ready for reviewing.