incorporating correct location