It’s disturbingly easy to forget where you parked your car at the end of the day, especially when you’re traveling in an unfamiliar place. By the end of a long travel day, you’re likely to not even remember what color your rental car was, let alone which parking garage you left it at. Thankfully, in an update coming to Apple Maps, this problem could be solved completely!

In the Apple Maps update, whenever a user takes a trip that ends anywhere other than home, Apple Maps will be able to automatically drop a parked car locator on the map. Users can edit the location of the pin, get directions to the vehicle, or determine how far away they’ve wandered. Another update on the horizon will allow the app to intelligently provide directions to the location you’re most likely en-route to by recognizing appointments stored in your calendar. For example, if you have a lunch reservation, Apple Maps will suggest the best route from your hotel. In the future, it looks like the only thing you’ll have to keep track of are the actual keys to the car themselves!