INCOMPLETE: many lwi changes