Added duplicate underscored/non-underscored functions
Added duplicate underscored/non-underscored functions