Added better consolidated scripts