Edits on JWT. WAMS