Navaneeth - Requiring customer to main, fixing issues with Company