added Location class