Continue working on client