Done!!

Finally, completed and tested the code