Fixed num samples and added timer to the client