added more location features