Modified some code

check this out