added some client side annotations