Updated scripts, still broken