drastically reducing forks in client