everything updated for resubmission