working on client section