Added the minor client work