updated according the new twjs