Fixed a bug, and also preserve order (based on first file),
Forgot to save.