Upgrade client

Use work done on MiS client.