The Galaxy S6 and Galaxy S6 edge have been updated to Android 5.1.1 by only a single carrier in the US, but Samsung has at least gotten the show running as far as the latest version of the OS is concerned. Now, we’ve been told by our insiders that Samsung has started working on an important update for the Galaxy S5, and we are hazarding the guess that this update will be based on Android 5.1.1.

Since the company has only just started development, it’s possible the official rollout will take a few weeks. It would be disappointing if users have to wait past the second quarter of the year, though with the Galaxy S6 and S6 edge still on 5.0 in almost every region, it wouldn’t be surprising if the 5.1.1 update for the S5 takes a couple of months to roll out. We can only hope the update will be worth the wait and maybe include some of the features of the S6, though we will probably be left hanging considering how Samsung’s update policy is a complete mess.

We should also point out that Samsung is testing Android 5.1.1 for the Galaxy Note 4 as well. We have no information on a time frame for the update’s completion, but you can expect to be waiting a couple of weeks after the Galaxy S6 and S6 edge make the jump to 5.1.1 around the world.