Changed to use fast locate