updated for Plus2