Updated Some code