put proper locations in