Reverted back to individual scripts for now