Updated with current scripts