allow json invokes
Comments for WS
Format code
FIX ISSUE