RESUBMISSION? rejigging refactoring to try and get certificate/provision happy for resubmission