Further work on client