Use new common function.