updated scripts to be more generic.