Adjusted as per CR