Still trying to fix scripts