Office 4/26 - client side stuff