Update scripts following testing

Update scripts following testing.