Changed rest of code

Changed rest of code