For those Samsung S7 owners who have been patient, or impatiently waiting for Android 7.0, or Android 7.1 to come to their devices this week’s release of Android 7.1.1 was most likely a kick in the guts, another version that they may have to wait for or never get. According to 9 to 5 Google perhaps you won’t be waiting long after all.

Apparently, a Samsung user asked the big S when their device would get 7.1.1 and the response was that Samsung would be upgrading the whole S7 family straight to the latest release, Android 7.1.1. Along with this upgrade not only would S7 owners get all of the 7.0 features like improved notification reply and Launcher shortcuts but they would also get the new Emoji and GIF keyboards.

Hopefully for S7 owners they won’t have long to wait.