changes from newclient

@lennartcl