Comments and Function Name Change