Working on WS

Signed-off-by: Levi <levi.lirvat@niji.fr>