Modified as per ACR comments