Apple Music may be working hard to dethrone streaming music market leader Spotify, but it also can’t afford to ignore the other horses in the race. Google Play Music has today launched a major revamp of its iOS and Android apps, using machine-learning to put together context-specific playlists and ensuring that you always have music to listen to even if you forget to download offline music.

But is is Google Play Music’s new-found intelligence that may pose the bigger threat. While Apple Music aims to learn your tastes and present a mix of human-curated and algorithym-based playlists, Google is upping the ante with recommendations based on where you are and what you are doing.

If Google can see you’re at the airport, for example, it will recommend music designed to de-stress you, even factoring in that day’s weather. As 9to5Google explains:

The app also now automatically downloads both recent tracks and recommended music to your phone so that you always have offline music to listen to even if you forget to download it manually.

Specifically, Google Play Music uses machine learning to figure out what songs you like and then factors in signals — location, activity, and weather — with hand-picked playlists to deliver personalized recommendations wherever you are and whenever you want.

With a big focus on context, opting in to the new features will deliver “personalized music based on where you are and why you are listening.” The latter includes everything from “relaxing at home, powering through at work, commuting, flying, exploring new cities, heading out on the town, and everything in between.”

The new features have already rolled out to the iOS app available on iTunes.

It was reported last month that Apple Music was considering a price-cut for existing subscribers, on either a temporary or permanent basis, but as subscription rates are set in agreement with labels, it’s unclear how this could be achieved.

Spotify has not been having the happiest of times of late, with reports of malware ads in the free version and out-of-control data writes that could reduce the life of SSDs.