Edit based on Parker's recommendation