improved location copying