[*] WS : improved performances