Client Complete FINAL : Bug fix with strings
Final change  I swear