Proper configure
Sahan's changes
Making supplier level changes