Now with updated script references