fixed #3
fixed #3 and commented out the part of code that is written for testing purpose