Updated conflicting function