Updated scripts to be more general purpose