Consolidated to a single script