Changed to use local copy