Done changes
Done location changes