#87 - location displaying remake