#13 Location now displays correctly