fully updated for wk3