added Location class, unused