Looking at your version, I'm surprised the original had so many problems. They should have commissioned you to do it xD