Wk2 additional updates