improved set location