Fixed Units and Added ws Call