Avari can do better in terms of service and struct...

Avari can do better in terms of service and structure quality.