Updated to new scripts