VIVA_WS_080 first commit