After resolve from last submit, need to change these files