added a couple more location fields