Changed Client program