Google is revamping Google Play Music with intelligence that it says will deliver the right music at the right time using machine learning. According to a post by Elias Roman, Lead Product Manager for Google Play Music, Google’s streaming music service will go beyond just figuring out what you like from the music you listen to. The update will also take into account context – things like your location, what you’re doing, and even the weather.

As Roman describes it:

To provide even richer music recommendations based on Google’s understanding of your world, we’ve plugged into the contextual tools that power Google products. When you opt in, we’ll deliver personalized music based on where you are and why you are listening — relaxing at home, powering through at work, commuting, flying, exploring new cities, heading out on the town, and everything in between. Your workout music is front and center as you walk into the gym, a sunset soundtrack appears just as the sky goes pink, and tunes for focusing turn up at the library.

In addition, Google has redesigned the Google Play Music home screen to emphasize your favorite music by putting it right at the top of the screen and adjusting what’s shown based on your context. The service will also automatically create an offline playlist of recently played songs for subscribers to listen to when they have no data connection.

It’s not surprising to see Google take Google Play Music in this direction. One of Google’s biggest competitive advantages is the data it knows about you from its many products. This sort of assistive technology is already baked into products like Google Photos and it seems natural to bring the same smarts to Google Play Music too.

Google Play Music will begin its world-wide roll-out to sixty-two countries this week on iOS, Android, and the web.