Use the old function