more modification to exchange sample app