Modified client side to run in iterative manner