Added in Client Code and fixed speed up bug.