updated for new scripts