More updates, supports two clients now.