Fixed server problem, client incremental