nearly final updates to match requirements