Added Location Assignment