Updated scripts to bemore dynamic and include suggestions from the team