Added in the changes requested for the CR