Fixing the scripts