Some code update