error in location corrected
structure for changing locations added