final changes for combination

Final files needed to combine both updated and final