Integrate last Shota's popup updates