added locations, needs refinement but works :/