Updated to allow addition of client side notes