final changes for combination

Final files needed to combine both updated and final
Merge pull request #2 from shirazsyed91/shiraz

final changes for combination