Small change to use existing function instead