fixed non_functionality, suppliers and location