Changes from WS 9/10 -13