Finally finished and passed the test. Here I attached the new patch.