Continuing work on resource locations