Tried to make locations more accurate. Cant quite get it