Updated with new manufacturers
Merged