I found some problems with the original and fixed it, so enjoy!