Resubmitted after code update