Edited Client & Server