Updated WS and fixed some sloppiness