UWK cleaned heavily.
Update