Code Added and Scripts Updated