Change as per kirk email