Changes made to make generalized scripts