Patch 1

Modified your code. Please take a look. :)