Updated KWSYS