Some code changed