update from Surface, to work on main desktop now