Is this function needed anymore?